Revert f219283..27f112c

This rolls back to commit f219283f61777ccb3b7e2b41e5127b0fb5d03aa4.