Revert d36b8fa..bb5cde4

This rolls back to commit d36b8faa843dbde7cd5e9bbb81ec20209a398258.
Minor changes