Undoing "workaround"