Merge "Remove pacmeaker workaround"