Revert 1cf5267..f86866b

This rolls back to commit 1cf5267295e9eca477f55a6dd508e632fd292e60.