Revert 094e7c6..596dd5c

This rolls back to commit 094e7c6f354227bdc1526bdd52a1bed0d8909de4.