Revert bfb11d4..a0d3fa5

This rolls back to commit bfb11d4623170d0050556d698da4e751030851d9.