Revert 3ab8504..b376a37

This rolls back to commit 3ab8504377975c5be50967e0b100e1e555ae4cea.