Revert 67028df..1cb03d6

This rolls back to commit 67028df829ce866d447d47f288262d9bc95b4d86.