I cant really think of why this would be needed anymore. See #192. See #319