*remove user workaround
*replaced tabs with spaces

Change-Id: I89e9f91e3049fc5a5997baf6c6e0df53c92d9493