Revert 05fffc6..dcfb78a

This rolls back to commit 05fffc682f5ed7a3e151f61753f5a1cf0b9e5d6a.