Revert a68e7d6..39b4315

This rolls back to commit a68e7d612e30ea5aa14bc9743df481f8cbb221d2.