Revert 0e7c1b0..5633944

This rolls back to commit 0e7c1b071ce31492971d2ad3ce6c1a6561d1d21a.