Revert f6e8367..a03b709

This rolls back to commit f6e8367d6180a4b148987e72d754936b2e22340c.