Revert "merging from original repo"

This reverts commit 5f7635300d232d7c2cd00090fe6c9a0e4e96ca89, reversing
changes made to 039d141943295be93949734c888b3c1a24a8385e.
Revert 0fc8d28..5a06fe8

This rolls back to commit 0fc8d28b469998b97b75e580663a7effba6867db.