Revert 6a6f3a2..25396d7

This rolls back to commit 6a6f3a26c5d85db0e6cb1b362c5eeed962c59722.