Reverted accidental changes, #5