Revert 9b9c59d..f60903e

This rolls back to commit 9b9c59d59dfc3fa26de99124b9c297ebea240aa6.