Revert 00746e1..f518d22

This rolls back to commit 00746e15b1c13f97b1316d75898506e957300974.
cleanup