Revert 1ef0697..71d6bcd

This rolls back to commit 1ef06978c028dc05e62aa814413fcac97393fecf.