Revert cfe57f0..8bdb0d9

This rolls back to commit cfe57f00e0a7710e0df253e8ed048773a32f1cbd.