Revert 7cd2a6c..0353d21

This rolls back to commit 7cd2a6c52a65a16a222e8aa635e8c848d89773dc.