Revert 99f0cc8..f9d218e

This rolls back to commit 99f0cc8dd5d4d48ca97348f7c7f21afb7a87ea3d.