Revert 6b5a512..92b4988

This rolls back to commit 6b5a512e43eedb45b096f67549382831d7776175.
Commit