Revert dd6fa78..34b595c

This rolls back to commit dd6fa78426cf99dca395bc6f9d7591d5d1b36a31.