Trying different approach for package stability

This reverts commit d44133864ae15da6e3c6b2c6817d1b1c39b7f66d.