Revert f89679a..8f4e750

This rolls back to commit f89679aa8b70bc3273abae3ba942b1a159378e0d.