Revert "Nic Hack 1"

This reverts commit 9865477795b2c4b75e497aebcb9fa16eb00331e6.