Revert 5cb0ee3..a0ff4ae

This rolls back to commit 5cb0ee38928ce16c023dfaa9b4fecf7e869ffde5.