Revert 787f7c2..4f583d4

This rolls back to commit 787f7c213657316aab649313e05fac006c43dd5a.