Revert d09fcfd..09bc3e4

This rolls back to commit d09fcfd06634f6918f55b2cc4b38c4ac3bb53ca9.