Revert dd2ec4b..b363118

This rolls back to commit dd2ec4b01dc268981e2a159921e02ca1d2e6c743.