fixing reverting
reverted back to working
Revert "reverted back to working"

This reverts commit 9c2bcf5b463189634d5dc9bf27cd289935b6513c.
fixed?