Reverted accidental changes, #4