Reverted some temporary code