Update from Original

This reverts commit 24008f327d028335b42e8e05776a697df7cc5095.