Revert 783094e..30d5eb6

This rolls back to commit 783094eba0eac7072bc1d3b0681b9b0890bd6f13.