Revert dcca033..6a5b481

This rolls back to commit dcca03348d40525dba39a994a8a44f106415269d.
commit before roll back 2