Nah no need....Revert "Almost there..."

This reverts commit cf03a9d2a939684a6e1928df9cb8284c8fb900c5.