Revert aea862c..345e5ad

This rolls back to commit aea862c074a93afe02b2289d822fb7bc29c1150c.