Revert 2af4101..4f7d987

This rolls back to commit 2af4101a898189a1e7aac56d6d843ab3631eb2f6.