Revert 9a82853..13e6a4d

This rolls back to commit 9a82853e54a719652e6190c6e541bdb6ba826a4e.