Revert 4df4b05..68f5c25

This rolls back to commit 4df4b0529c14d7ea8c810360a1f402774a6eee94.