Revert 182d095..0d8eb14

This rolls back to commit 182d09548ddf75ddf18239858e03cc565acaa90d.