Revert 4f38d67..3d44fb9

This rolls back to commit 4f38d672c6f313c31e0eacc5093132eaabc7b589.