Revert 0291083..9d7864c

This rolls back to commit 0291083f4ad8bef6192c5e25e160235b7822eae0.