Revert 80115e6..e4ec37f

This rolls back to commit 80115e6927970b6f0a762937b04950779ec105da.