Revert 9462fe2..8bf9865

This rolls back to commit 9462fe2353edbfb3cf6942883f3214bb5b704c9a.