Revert 45100db..0c71a42

This rolls back to commit 45100db596d4abd114f51aefb06c2496a0769b09.
fixed bags