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