Revert 07f427d..7b16fd6

This rolls back to commit 07f427d8f2f0d2f63dcbe1bde522db081497d292.