Revert 39ef78f..94c442b

This rolls back to commit 39ef78fbb88ca9c4e8581acb1ffd83fee3f06b9f.