Revert 72b6c45..92d4542

This rolls back to commit 72b6c4589f8ba89d6102c5dc94669b497b8b10b3.