Revert 24cf7b8..6361e04

This rolls back to commit 24cf7b878e6365c7c8099aa8a975b7b545204c69.