Revert 3da6b50..72c11e6

This rolls back to commit 3da6b50cded6f06f9d186e7cc4e36332d9fd830c.