Revert 089b824

This rolls back to commit 089b824105aa482b93f9c23ea7e49ea3a93b2940.