Revert f614775..1c9cd56

This rolls back to commit f614775ea050d7f9c8f0dce460db408af6c2588f.