Revert "Bad commit reverted."

This reverts commit 4454084e5969ebad02ee2147327a18f9ad038671.