Revert aec6905..752bf02

This rolls back to commit aec690541bbb8b77c8141fb0df2edad90b99e955.