Revert 72c692c..d81d65c

This rolls back to commit 72c692c9b5fce4ce82a6cdb7d537307a39c783d9.