Revert f4b5afb..e39bbd3

This rolls back to commit f4b5afb280d990076a4e9123205b9668f95072e0.