Revert 61b6b1e..f0cabee

This rolls back to commit 61b6b1ec523e343a333f87d584d5844f8279b9e1.