Revert c88eda3..67809db

This rolls back to commit c88eda3cc74c3e3f770f0a764995e2946016e5b6.
remove