Revert 34b0739..579482a

This rolls back to commit 34b07392bd96f9548ca7833563ec81c11d440dcd.