Revert 75ebbd4..2f3a5ee

This rolls back to commit 75ebbd4dc9ddc01b6672a87db0a75a06eb7bdc93.