Revert 3b84153..9408397

This rolls back to commit 3b841538abfc719cc470cc00429ddbd819747a94.
STILL NOT WORKING