Revert 9911059..a2cb5da

This rolls back to commit 9911059ecc86efdcbf8e1746067c8bd553659d8b.