Revert 3d14cbc..41eaf59

This rolls back to commit 3d14cbc733bcfb382331021752d91d1dc3bb3a03.