Revert f02bddd..4bfd3f0

This rolls back to commit f02bddd88838275b09c95719dd597ff8daa56f0b.