Revert 17fd529..4f234ca

This rolls back to commit 17fd529e4be4556d493654964846c52fe0d109b2.