Revert "Squashed commit of the following:"

This reverts commit 69b5f133c52b0de0de3aba0bed6d727b5b3db00a.

This broke boosted applications.