Please create an issue for this. Remember to include the removal of these kind of workarounds.