Removed workaround for (#424527, Savannah: #36770)