Revert workaround for bnc#900112, which is fixed