Revert "Revert "Reverting changes for testing""

This reverts commit f944c906003c5ae8ee176f52436d9f016a2dbd50.