Reverted hp343's commit