Revert 049ab4a..0b27da0

This rolls back to commit 049ab4ad95585da241b3ee5049e6c7c63983ad13.