Revert ba5cbfe..e01f826

This rolls back to commit ba5cbfed612d0e0da3539bdbc52cf08e01e08e11.