Revert 9f6765d..de8bdf3

This rolls back to commit 9f6765d07186311c4010fb29ce5de28e63736107.