Revert 23fa46b..33b376d

This rolls back to commit 23fa46b07ddeec0e4feb42d888bec34936b6cfe7.