Reverted accidental changes, #1