Revert 56cb335..6864ea4

This rolls back to commit 56cb3354017252f9bdcfe98ef75e9280a118d5fc.