Revert 6b08788..e3502ff

This rolls back to commit 6b087884ebd1ec90064e45568420f99e0c198171.