Revert aeb0802..4c4a600

This rolls back to commit aeb08024241b65a4319c6612e0496e19c3aae947.