Revert f5b32df..4996697

This rolls back to commit f5b32dfc7f3973705e48a65bdffe08c4767a81f3.