Revert 6bb71a4..738f1d8

This rolls back to commit 6bb71a4d69964a7e97f83845ba85b2fe10fda19c.