Revert f624914..3bd56c5

This rolls back to commit f624914874deab1cf8ea468783b0174a7c9850ce.