Giancarlo added code
Revert 63b3702..5ad319c

This rolls back to commit 63b37021a7f15ae49f1539b608728212d04986e6.
Revert for Spring Promo