Revert c5d024a..5845da4

This rolls back to commit c5d024aa7bd5bd8860689530e42557820ad12623.