Hack for 3rd Birthday
Revert "Hack for 3rd Birthday"

This reverts commit 7dafa784b29db6242f3413991f2caddbe8b3eaa8.