Revert 273aa77..e16950e

This rolls back to commit 273aa771b6bd157845dff8cd27a93ab3156ff5b4.
Final Changes (hopefully)