Revert "12/09/14 v24"

This reverts commit 79d97d06a90a1d80c3359fdd0eceb4d88a0e4a34.
commit