Reverted accidental changes, #3