Revert 0870d18..3657d07

This rolls back to commit 0870d1861581e85b46d8e310bb714c4c35885d05.