Revert 6c4bbd9..d9c413c

This rolls back to commit 6c4bbd9f6e996205ac1d6e6d2682b454a450bcda.