Revert 8af2921..2d1d40e

This rolls back to commit 8af2921099050c430a9b2e56657f297f0be0d1b8.