Revert 948707a..e4f653d

This rolls back to commit 948707a1f7234c4e1964ffd4c4334f60578ae09f.