Restored some features erased with the previous commits