[PSW-176] Rollback last commit--should have been in master.