Revert f1cb2ba..fd7c3a9

This rolls back to commit f1cb2ba39f14a2a9c53c3ff576b1375eb13d3ed8.