Revert 572fd55..0608452

This rolls back to commit 572fd555d5ee2eb6320eadfa4c007c7553ec028a.