Reverting #9 until more clarification.