Revert 339c96f..e3dd77c

This rolls back to commit 339c96f8d1abc57af705bb409b99600f7cf827f7.