Revert 5a4d8bc..3974ea8

This rolls back to commit 5a4d8bcc5a447d379de5b09fe619c76091665940.