Revert 491d0fc..c4fd3fa

This rolls back to commit 491d0fcab1e19ba2e6b2efdc68d34b547caae3e0.