Revert previous commit a912031