FIX: revert, whitespace removal requires more attention