Revert ef784c0..f4bb70d

This rolls back to commit ef784c052e6fbc79ce0b4f2bde3af3f369540a0f.