Revert 337f806..8577efc

This rolls back to commit 337f80634f520f784114a6b903161e1a783ece4c.
roll back