Revert 78953b1..66e76b5

This rolls back to commit 78953b144de082896a2910c48a55f72651c11c8d.