Revert 070844f..f35632a

This rolls back to commit 070844f3ecbc92163f724406931de739b488ab8e.