Revert ba9fcbf..e3d3263

This rolls back to commit ba9fcbfc11b06e3aa2283ed501b9578c8faf4138.