Revert 34e345a..84bcabf

This rolls back to commit 34e345a527485ed03985f381a8e8db59a72df7e1.