Revert fd904a8..0d0c205

This rolls back to commit fd904a86f81fad95479366a913f37ffde5dc8070.