Revert 8a0c26c..5aaf030

This rolls back to commit 8a0c26c48a2c9a1242cb98e0ef71fd798624f262.