Revert 958bc65..0016b47

This rolls back to commit 958bc65990624f5ce0452ad3564435de435a4bea.