This reverts commit d87b9b81cc. Post commit review raised concerns, reverting while discussion happens.
d87b9b81cc