Revert 1a78491..05b7711

This rolls back to commit 1a784915b024feb1d11084cc9e78e3d0baf16d35.