Reverse unfinished code that wasn't meant to be committed...