Revert 82f66c4..eb21b2a

This rolls back to commit 82f66c4b7ba0f0b2fcbd62de11304780beda8e30.