Revert 920c566..157380e

This rolls back to commit 920c566d160e7abb2f8dc5bd94f082e4dd320429.