Revert 412ecef..8ce1c6e

This rolls back to commit 412ecef8b95fcc5d375d3e0e7ac8f85a85dba5c2.