Revert 96efaf4..316c4e6

This rolls back to commit 96efaf42a4dbd7482c7bc778bab95535588d05eb.