Revert f1fcfa3..43635ed

This rolls back to commit f1fcfa38a9905217f4758afa835a83f58f91eb54.