Revert 55115b1..12a9cc4

This rolls back to commit 55115b1b2a98ed39f15864691f4cf24a570fb44f.