Revert ebb5f88..72da7d7

This rolls back to commit ebb5f8865796b6c1be1ffa2345a0d51069f257fd.