Revert f21c0b8..f4b157a

This rolls back to commit f21c0b8833bedc94f135c86d633a9199a3ffd5d2.