Revert 0708911..f378b88

This rolls back to commit 070891139c89d48d040c35224024f5356a83a3bd.