Revert 892111c..a6aca03

This rolls back to commit 892111cf4dd33a8f13e2816c274ed294dc7c4c9f.