Revert e8de687..1148a1e

This rolls back to commit e8de6875ea50d77b27801de51b67ab44828538b0.