Revert 2267e1c..9de2d54

This rolls back to commit 2267e1cd7406efc1b251955a106948374ca95f3c.