Reverted accidental changes, #2