Merge "Removing the skip decorator as bug 1687044 was already resolved"