Revert "Second Try at this!"

This reverts commit a38a3c73ec99dcb37a11e89e75d58facc980ac32.