Revert df95bc3..8ce7d77

This rolls back to commit df95bc31420c88509ac90b4006be45e676060c0b.