Revert 6a08bd4..ce37b28

This rolls back to commit 6a08bd4ac7e882a2befaae64df8a60192a56d903.