Revert d43e585..cbff131

This rolls back to commit d43e585995c5d8a13bf84ef26e91c0a40cac3ef4.