Revert 8ee4ac1..002b55a

This rolls back to commit 8ee4ac1a30765c7d1bceb4244a3704e71c96e0fd.