Revert 7d042d1..f44bd1c

This rolls back to commit 7d042d1d2fe3e47e35133005556837be2e3f011c.