Revert 99921c6..1918833

This rolls back to commit 99921c637ee2aabaddcf47e3a5c0cea18e559533.