Revert d7465a5..a70aa66

This rolls back to commit d7465a53c1202d4d7c4700d40cf9fc69f4a7c4f5.